Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Tue, 12 Jan 2010 07:54:18 +0000 (08:54 +0100)
committerJan D. <jan.h.d@swipnet.se>
Tue, 12 Jan 2010 07:54:18 +0000 (08:54 +0100)

Trivial merge